Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 04:45:16 +0000 (20:45 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 04:45:16 +0000 (20:45 -0800)
commit3ef4e9c14b7c39742b86e7a8cfbcd22b2f513fca
tree8b7bf1bf6610eded932299f0c06a4febe15cd613
parentbe3bdf5e68ed150dda6745e4d4d71170e52ccf98
parent9c2b3f90c28909e85ffdb4d5592ff0ef7bf64154
Merge from mainline.